auto merge of #827 : DiamondLovesYou/cargo/master, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 11 Nov 2014 22:29:36 +0000 (22:29 +0000)
committerbors <bors@rust-lang.org>
Tue, 11 Nov 2014 22:29:36 +0000 (22:29 +0000)
commitbf3d6f06b7642c6be6badd1e35ae6161a8758237
treefd4f30053249767f37e26a934bb1b26e694e594f
parent644b98eac049433ae87ff52f4fd33bf932e85095
parentb9f54c5524400681366420263a8b7bd1f6492074
auto merge of #827 : DiamondLovesYou/cargo/master, r=alexcrichton